Fixed the arrangement