Minor changes for fluid layout