Added some Asthetics and removed some