Tidying up with some changes

Just added some packages to make it more neater.