#529 layout fixed