Modified view

Did some stuff, works better. It's all good.