GUI updates + final touches