Theming and more changes as per wireframes

Signed-off-by: Ben Bailey <ben@happycontent.com.au>