Changed some layout files and corresponding code