Work on layouts
updating
updating to current master (I hope no more conflicts)