fixing the layouts and updating gitignore