Layout cleanup for mobile