Updating layout and adding more methods