Updated to fix layout problem in Mavericks