Layout and view fixes
Updated .gitignore