Added a lot of polish for transition screens, restructured trigger entities