Reworked GUI navigation