layout updates, added grid system