Layout fixes and updates