Adjusting grid
Adding sub panel and better modal alignment