Updated to look better and fixed