Little fixes
Design update