Refactoring to seperate properties/private members
HUD Improvements
Test level changes