Redesigned the code based on New Tablet UI