New classes and layouts for the GUI