Updates to design and functionality
Fix broken desktop/tablet mode