Napoli fix

Fixed some positioning issues with Napoli