Expand/collapse icon toggles

Added toggling of expand/collapse icon
Fixed a few alignment issues message file uploads