added a border for snapshots, cleanup