GUI: Rework views