Refactor activity UI elelemts