More attachment UI improvements
UI Polishing