Add Acts Screen functionality
Minor bug fixes