Many layout updates, new plugins

Final version, ignore the rubbish commits!