functionality updated, styled goodly