Code refactoring
Small UI updates