Fix some layout issues and button issues