Starting on working on general cases

Fixed the little layout problem in the two special cases.