changed theme, refactored into parent and child activities