Made style more consistent and worked on unit movement