Moved views in to inline templates
Minor whitespaces cleanup