Updated GUI with better format