refactor structure, add simple grid system