Cleanup and code reorganization
Added various input elements