Changed some basic stuff for initial template