code cleanup
added redirect buttons