Fixing build element, styling issues