Code clean up, and added html and css on screen rendering