Major update of layout and functionality