cleaned up and re-organized code, fixed previous fluid layout issue