Updated design closer to PSD