Made some revisions and cleanup, added custom CSS