Added up button, and fixed layout issues.