build and small changes to layout