Work on alignment for the GUI