Further updates for mobile layout