Layout fixes for small