Moved evrything to one partial view now