More UI and calculation logic, first phase done