Files view layout

Fixed #2427
Fixed #2433

review: @devoncarew