Fixed minor bugs and improved some views