Optimised Move code & updated CSS