Fixed layout overflow issues