Added HUD + Small fixes
Prep. merge with master
Removed inheritance
Prep. merge with master