huge layout improvements - yay