Cleaned up UI a bit, cleaned up src files