Further frontend changes

Signed-off-by: Thameera Senanayaka <thameera@alliontechnologies.com>
Started with assess by student