Tweaks on feedback views and layout