Added testing code

Small UI changes