Cleanup design ideas
Add some features