Restructured UI
Cleaned up UI
Quantities found properly and tests added