added the finishing touches

I added the finishing touches to the layout and made sure the results
are returned correctly