Cleanup some views, for the better I hope =)