Merged the angle view code