Dev

Mostly layout changes + add a feature