reorganized items on main form a bit