Fixed minor issues with layout