add some styling and reorganzie layout a little