DC: fix some lint issues

Change-Id: Id466b54129a5d7aa72f52c76989bcee733ca8f36
DC: highlight selected menu entry

Change-Id: I7b0279f9487886057b55df97fa6221f588d0a752