Added some more builder methods and did some cosmetics in skin template