Add basic mobile layout; more cleanup