More updates to the design