Remove redundant class
Preparation for AppStore release
Update Visuals
Fix initialization order bug