add border view controller, fix layout order