Layout fixes for Beta