Johan

Add all the screens I've created yesterday (June 3rd 2013) to master.