Style changes and added functionality