Fix some bugs from redesigning UX