Fixes for better layout