BEFORE CHANGES
user gui improvements
user gui improvements