Finalizing main app for alpha testing