little refactor on timestamps
lot of tiny refactors in ui classes