Updated Application Layout