Most of the way through cleaning up application and splash layouts