Updating the deck usage and some layout changes