Fixed #24: A lot of view changes to improve mobile UX