Stage border / Clean up s1 bottom spacing