Better folder list presentation and management
Small fixes
Code Cleanup