Update build tools and fix layout