Reworked activity view, added new buttons