cleaning up layout and link