refactored to move picture into its own package and clean up the design