Upload functional, simplified layout, renamed controller and views.