Extended grid system, added button generator