Mobile enhancements and more layout additions/fixes