Improved flow and interface
Improved overall interface