Added CurrentPollLayout and fixed resource naming