Cleaned up dependencies/code and fixed CSS bug