Fixed some presentation issues + help