"Major" code refactoring (split one activity in half). UI finished and polished.
Trying to fix git