Finalize remaining issues on mobile layout