Adjusted layouts.
Removed upload window and moved to a new class.