Updated Main

Added new test cases, UI formatting required - look for TREVOR CHECKS