First draft of new GUI layout + tables