Cleaned up the code and added css transitions to a few items