Fix some bugs, improve some views..