Merge branch 'workingMap'
edit control for query panel
adjust qrs button
Remove grid system + adjust style
Merge branch 'master' into workingMap