reorganized ui + added time first on