Refactoring & manage better smaller screen