Fixed some major bugs;
Changed design of some views;