Updated to fluid layout