Fix small bugs w layout