Working on layout, added new widget
Merging master
Recap time