Clean up board layout