Added context actions and started fixing UI to highlight upon selection