Updated App with correct tabs