Fixed some bugs, removed redundant code and added favicon