Fixed nasty bug and the top views