refactored states: separated entry state from main app state; fixing splash now

let me know if you encounter any issues ASAP.