More customizations and Devise changes