Added some timing functions, cleaned up UI