Fixed basic moving.
View cleanup.