Some testing and layout redesign