Clean up layout and explain rules more clearly