Finalizing some of the design. Adding the polish :)