Fixed some layout issues