Layouting and view rewriting
Minor template fix + url fix