Beautifications & Functionality upgrade