Slight stylish fix :) almost all ready