cleaned up GUI, everything fits well with grid