Update on MainActivity-prototype