varios layout changes and changes to view action