Asthetics + bug fix