Drawer improved, save Methods optimised, nested Navigation fixed