updated based on Jira LRTS-132, added functionality, layout and formatting