Updated design and small things