Fixed normal_view bugs and cut dummy code