working on non-fluid layout
fixing major layout done