Period Follows (bug), Cleanup and UI fixes