Fix counter and break UI elements into module