Fixed AMD support added some style and order