Added button groups to clean up edit and archive buttons a bit