small changes, need to finish top buttons in exercise activity