updated some formatting issues and setting up activities