Refactored. Fixed Startup Push Behvavior Upwards