Improved MainActivity design