Some issues with drawing layers solved.