Removed templating markup
Got basic form