Fixed some ugly layout issues