Rearranged widgets and home. Minor changes to views and osd.