Changed template and some styling