Updated some layout issues