Major poster code refactoring