Changed some layout