Layout fixes for bottom part