Overhauled GUI