Edited layout and fixed max control pt to 6