Bug Fixes and Restructuring (App is now 110% Stable)