Finish basic layout, some functionality