revised layout, needs to be beautyfied more