fixed some annoying layout issues