Swap panel and map control positions. Code comment cleanup and clearer function names.