Merge pull request #504 from webdetails/BISERVER-8738

BISERVER-8738 - Included remaining UX team feedback
BISERVER-8738 - Fixed line size when file/folder is selected. Added a different solution