Added some style enhancements