Fixed all layout issues