improve map controller implementation
improve layouts