Major update on display and moving