Remove black border
Make expand/collapse functionality similar to viewer's