Massive simplification of system. Now gets UDID and redirects
Tidy up of layouts