Adds site definition, adds button margins, fixes and new variables