layout changes, permissions fix etc